Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-05-25 9d7ab0a7c93f3d377dbe049e2471c41c25621a01

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