Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-08 81a4dc5a1f17848bf544dae54582097b93c295cc

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