#554 develop to master for v0.10-M1

Merged Dennis Hendriks requested to merge develop into master

Addresses #554 (closed)

Merge request reports