Merge branch 'master' into dns-dnssec

A. Täffner

2016-01-20 cab3bca1d75be6c7f3140a35396d8c6ee2011801

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