redmine#101
Merge branch 'hotfix/redmine#101'
redmine#101
Merge branch 'hotfix/redmine#105'