Merge pull request #1578 from user7887/for-15.05