Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-19 dfe337e04cbc50fed4df23763e67103d6778764e

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