Merge branch 'missing_fonts' into 'stable-3.1'

Marius Burkard

2016-07-05 a666126a2f37520c6990a1670baba9ddf070b1a5

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