Merge branch 'stable-3.1'

Marius Burkard

2016-01-20 ec64cf5c39c388c297607ba3ac1424f057eafaee

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