Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-22 62f5b704bcf35b25f5fabbadd8faa9d70b0b3fbf

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