Merge branch 'fix-db-stats' into 'stable-3.1'

Till Brehm

2016-06-16 8225ad2d0778160477c5b23e6fc14d608578b796

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