Merge pull request #1172 from hlef/master