Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-12 51e1dde2aa5c31b01f77479fe3fc86dffd2c8f29

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