Merge branch 'stable-3.1'

Marius Burkard

2016-01-26 ab3c7dfb89aee966d336c2d68d0220d5a1b7893e

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