Merge pull request #1503 from user7887/master