Merge branch 'develop' into 'master'

Promo 2018

See merge request !8
1 job for master in 42 seconds (queued for 1 second)
latest
Status Job ID Name Coverage
  Test
passed #9688
build

00:00:42