Merged r13784 (#14699).

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13798 e93f8b46-1217-0410-a6f0-8f06a7374b81
Merged r13659 (#18464).

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13799 e93f8b46-1217-0410-a6f0-8f06a7374b81
Merged r13670 (#18499).

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13800 e93f8b46-1217-0410-a6f0-8f06a7374b81
Merged r13677 (#18501).

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13801 e93f8b46-1217-0410-a6f0-8f06a7374b81
Merged r13785 (#18665).

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13802 e93f8b46-1217-0410-a6f0-8f06a7374b81
Merged r13787 (#18667).

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13803 e93f8b46-1217-0410-a6f0-8f06a7374b81
Merged r13768 (#18685).

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13804 e93f8b46-1217-0410-a6f0-8f06a7374b81
Merged r13786 and r13789 (#18679).

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