Merge branch 'stable-3.1'

Marius Burkard

2016-01-18 b6a0ab059e67975984633b1a99446818b3e9ee59

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