Merge aus bfpi-fix-redmine-8 (closes #39)
Merge branch 'bfpi-fix-redmine-8'