Merge branch 'patch-1' into 'stable-3.1'

Marius Burkard

2016-05-03 f43994cca340165770db223e116fd81e9ab7b429

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