redmine#96
Merge branch 'hotfix/redmine#96'