Merge pull request #956 from lucize/master