Merge branch master into dev

Nico Bugl requested to merge master into dev

Dev

See merge request !143 (merged)

Edited by Nico Bugl

Merge request reports