Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-04-26 2e86dd528354a8267521e045a185f920683e4724

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