Burnup
RM2 fixes
Merge branch 'master' into redmine2
RM 2.0