Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-15 d302d8e556da5b1dcd9ce4f9ec086a0e4aa52dd6

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