Merged r12660 (#13544).

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12845 e93f8b46-1217-0410-a6f0-8f06a7374b81
Merged r12652 (#15664).

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