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

Till Brehm

2016-04-07 6a85386aa4a1fd2072341546f4b07937cdbd94e5

1
ALTER TABLE `shell_user` CHANGE `ssh_rsa` `ssh_rsa` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;