Merge pull request #1113 from alexvh/master