#479 develop to master for v0.9-M1

Merged Dennis Hendriks requested to merge develop into master

Addresses #479 (closed)

Merge request reports