Merge branch 'master' into 'master'

Marius Burkard

2015-11-26 add7cc461c0729819c73b2bf44076037a1592517

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