Merge branch 'master' into 'master'

Marius Cramer

2015-11-12 8ce5e3054e6bc70cc44e8d2d002ac035f02bd9ec

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