Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-04-05 077c4a5ca83ef43f75c1688023c2d9494a407db4

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