Merge branch 'stable-3.1' into 'stable-3.1'

Marius Burkard

2016-06-03 bd4c2e96fd4566bfcd8042f82ccac090419734a3

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