Merge branch 'fix-3986' into 'stable-3.1'

Till Brehm

2016-07-21 d682d6652ac253e601b76f7a8f3cd38ba31ea73e

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