Merge branch 'stable-3.1'

Marius Burkard

2016-01-26 c02e3dc6a5b0b65a95a75ca1e37294aee615d108

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