Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-30 5e981c0c36166071298a6b82cead9f81310842ab

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