Merge branch 'develop' into 'master'

GDW WS18/19

See merge request !1
3 jobs for gdw_ws1819 in 12 minutes and 45 seconds (queued for 13 minutes and 10 seconds)
latest