Merged r13127 (#16564).

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

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

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

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

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

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

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

git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13161 e93f8b46-1217-0410-a6f0-8f06a7374b81
Merged r13140 and r13142 (#16795).

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

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

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

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

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