Merged r12146, r12147 and r12148 from trunk to 2.3-stable (#14931)

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12151 e93f8b46-1217-0410-a6f0-8f06a7374b81