Merge pull request #1160 from hlef/master