Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-29 dad105ff4110e29a584af3e5dc75c0f3cfcd0dce

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