Merge branch 'develop' into 'master'

Release 13-03-19

See merge request !140
4 jobs for master in 4 minutes (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #12385
test:php

00:00:14

 
  Build
passed #12386
build

00:00:28

 
  Layout
passed #12387
layout

00:01:50

 
  Deploy
passed #12388
deploy-master

00:01:26