Merge branch 'dns-dnssec-fix-dbmaster' into 'stable-3.1'

Till Brehm

2016-04-12 c92a4ee47ce5a7bb6b0e32a321ce09fece3e11dc

1
ALTER TABLE `web_domain` ADD COLUMN `enable_spdy` ENUM('y','n') NULL DEFAULT 'n' AFTER `proxy_directives`;