Merge branch 'stable-3.1'

Marius Burkard

2016-02-21 8a4a057376d8371aa976f3f37b178cd738c4eb59

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