Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-21 856a3fda5a9c7a59bc89e3ac4800465e7b72c591

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