Merge pull request #1500 from user7887/master