Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-15 09b790e9c59c496ec1aa537ff7bfa21ca0f4b5cd

1
ALTER TABLE `ftp_user` ADD `expires` datetime NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `dl_bandwidth` ;