#392 develop to master for v0.7-RC1

Merged Dennis Hendriks requested to merge develop into master

Addresses #392 (closed)

Merge request reports