Bugfixes (build 1.9.0.4)
Merge branch 'master' into ReportCreation