Merge branch 'ftp_statistics' into 'stable-3.1'

Marius Burkard

2016-02-11 bc963bcc5a97857399f1798a1a0dd467b9ecec3b

1
2
3
 
-- increase column size
ALTER TABLE `client` CHANGE `template_additional` `template_additional` TEXT NOT NULL;