Merge pull request #1501 from user7887/master