Merge branch 'master' into 'master'

Marius Cramer

2015-09-03 e10d34abca22c0d18759c536dd5ba1bca9705734

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