Merge branch 'master' into 'master'

Marius Cramer

2015-11-11 64604dedaf7ff5c86db5e5e7d82de62ba3a1df2c

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