Merge branch 'stable-3.1' into 'stable-3.1'

Marius Burkard

2016-07-05 72cefc438c0d279be66cd95c7b42a021ae647d51

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