Merge branch 'dev' into 'master'

Nico Bugl requested to merge master into dev

Dev

See merge request !146 (merged)

Edited by Nico Bugl

Merge request reports