Merge pull request #3625 from slide/master