Patch by Marius BALTEANU and Mizuki ISHIKAWA. git-svn-id: https://svn.redmine.org/redmine/trunk@21763 e93f8b46-1217-0410-a6f0-8f06a7374b81