Merged r13218 (#16989).

git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13224 e93f8b46-1217-0410-a6f0-8f06a7374b81
Merged r13213 (#16530).

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