Merged r13219 (#3483).

git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13221 e93f8b46-1217-0410-a6f0-8f06a7374b81
Merged r13216, r13217 (#17003).

git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13222 e93f8b46-1217-0410-a6f0-8f06a7374b81
Merged r13220 (#17392, #17003).

git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13223 e93f8b46-1217-0410-a6f0-8f06a7374b81