Merge pull request #3141 from ometol/master