Merge branch 'missing_fonts' into 'stable-3.1'

Pascal Dreissen

2016-07-05 1a485fd6abef7a969edbd43cd028e7d351bfdd8a

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