Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-04-11 de7d2617421127b9cc7edeb3b17401246046714b

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