#265 develop to master for v0.5

Merged Dennis Hendriks requested to merge develop into master

Merge request reports