Merge branch 'stable-3.1'

Marius Burkard

2016-02-18 295bd9c18daa96ebee81a2662f222b915b851104

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