Merge branch 'master' into 'master'

Marius Burkard

2015-12-23 6a00b4e599f724cbc9a12927c8a0446ef5621028

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