Merge pull request #2917 from oneru/master