Merge branch 'master' into 'master'

Marius Cramer

2015-09-13 1ec1fc69c4b550b15f3b04d2988e2138a5e22477

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