Merge branch 'release/201205151651'
redmine#86
Merge branch 'hotfix/redmine#86' into develop