Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-31 dbf57dddf7ef07a0168ad0c1d64de0735a9c5804

1
2
3
-- --------------------------------------------------------
 
ALTER TABLE  `web_domain` ADD  `perl` enum('n','y') NOT NULL default 'n' AFTER  `python`;