Merge branch 'stable-3.1'

Marius Burkard

2016-03-02 75124b0197a20947b67b502db19af79d4936f306

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