Merge branch 'master' into 'master'

Marius Cramer

2015-11-15 85fdab1f3538495979abfceedb44dcf5e5002e2a

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