Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-18 324bfbde30d632bcd19009dbca1cb68cb160fbc1

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