Patch by Felix Schäfer (@felix) and Takenori TAKAKI (@takenory). git-svn-id: https://svn.redmine.org/redmine/trunk@22834 e93f8b46-1217-0410-a6f0-8f06a7374b81