redmine#106
redmine#106
Merge branch 'hotfix/redmine#106'
redmine#115
Merge branch 'hotfix/redmine#115'