block by wereHamster 669059

Cherry-pick a svn commit and add a 'Merged from rX' message at the bottom

git-svn-cherry-pick