pull master changes

Merged Philip Müller requested to merge master into development

Created by: philmmanjaro

Merge request reports