Merged r12420 (#15684).

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12433 e93f8b46-1217-0410-a6f0-8f06a7374b81
Merged r12419.

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