Merge branch 'stable-3.1'

Marius Burkard

2016-02-18 c59ab58240bedf431567e206a71a6ad62a106441

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