Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-05-26 498c86fbbfc4aa034758693309dd97b7ca4ef4f0

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