Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-05-26 498c86fbbfc4aa034758693309dd97b7ca4ef4f0

1
ALTER TABLE `web_domain` ADD `document_root_www` VARCHAR( 255 ) NULL AFTER `document_root`;