Merge hotfix-2013-06-07