Merged r11737 and r11738 from trunk to 2.3-stable (#13823)

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