Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-04-22 4ae3b94bce6b2f26002c1a50247a01ab4cf2219a

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