catching up

Martin Deimelrequested to merge
master into develop

Created by: kmcos

Changes proposed

Merge request reports