Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-01-26 9f65de0b6bbfb0824e34088029e4f593a28303e1

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