Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-05-09 9e63ffc814b8087ea8c1ba7c819bc91ff9ee985a

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