Commit b05b9fa9 authored by Dominik Hebeler's avatar Dominik Hebeler

Merge branch 'master' into 'development'

Master

See merge request !1504
parents cfdde2f1 8fa7b9e2