Merge pull request #887 from anisse/master