Merged r11371 from trunk (#13165).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11593 e93f8b46-1217-0410-a6f0-8f06a7374b81
Backported r11424 from trunk (#12243).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11594 e93f8b46-1217-0410-a6f0-8f06a7374b81
Merged r11351 from trunk (#13127).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11595 e93f8b46-1217-0410-a6f0-8f06a7374b81
Merged r11446 from trunk (#13232).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11596 e93f8b46-1217-0410-a6f0-8f06a7374b81