Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-30 22c91099a17a134ed90cd94223baf9c92ba106f4

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