Merge branch 'fix-issue-3943' into 'stable-3.1'

Till Brehm

2016-06-14 da8c5263302809434d43c9f385f8bac57b49d851

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