Merged r13638 (#18060).

git-svn-id: http://svn.redmine.org/redmine@13642 e93f8b46-1217-0410-a6f0-8f06a7374b81