Merge branch 'master' into 'master'

Marius Cramer

2015-09-04 842b5c34e70869b7b1a0d368cbb6280f737301d3

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