#264 master to develop for v0.5-RC1

Merged Dennis Hendriks requested to merge develop into master

Merge request reports