Merge branch 'develop' into 'master'

Release 16-03-19

See merge request !407
5 jobs from master in 7 minutes and 30 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #12446
test:php

00:00:22

passed #12447
test:unit

00:03:22

 
  Build
passed #12448
build

00:00:30

 
  Layout
passed #12449
layout

00:02:08

 
  Deploy
passed #12450
deploy-master

00:01:27