Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-15 09b790e9c59c496ec1aa537ff7bfa21ca0f4b5cd

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