redmine#86
Merge branch 'hotfix/redmine#86'