redmine#116
Merge branch 'hotfix/redmine#116'