Merge branch 'master' into 'master'

Marius Cramer

2015-09-03 57963434331b48627cc2a0bfcff3924b0112995e

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