Merge pull request #1148 from hlef/master