#480 develop to master for v0.9-RC1

Merged Dennis Hendriks requested to merge develop into master

Addresses #480 (closed)

Merge request reports