Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-17 21ef2a6c470b42655fee4baf5f3f4251ea2dd9ec

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