Merge branch 'stable-3.1'

Marius Burkard

2016-02-11 0e8c9aeef967fd3437d3d1a8df917724d4bebf0f

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