Merged r13213 (#16530).

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