Merge pull request #1504 from user7887/master