Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-05-04 f6513f0be58f1dd441f3778f8a9d259bbc7267e4

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