Merge branch 'stable-3.1'

Marius Burkard

2016-01-20 337473b29af23892d2bcbe4cc97c087aa5ff8b30

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