Merge branch 'dnssec-fix-cron' into 'stable-3.1'

Till Brehm

2016-04-07 6a85386aa4a1fd2072341546f4b07937cdbd94e5

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