Merge branch 'development' into 'master'

Development

See merge request f00f/geike-arnaert!13
1 job for master in 5 minutes and 55 seconds (queued for 2 seconds)
Status Name Job ID Coverage
  Publish
passed publish #3046

00:05:55