Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-04-29 d30f2c69b1fbfcb9bebe17996d11dc4863afd8bc

1
ALTER TABLE  `mail_user` ADD  `autoresponder_subject` VARCHAR(255) NOT NULL DEFAULT 'Out of office reply' AFTER  `autoresponder_end_date`;