Merge branch 'master' into 'master'

Marius Cramer

2015-07-30 a014597671651cdc10f88a2816ea39b9f1451666

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