Merge branch 'dnssec-dnswizard' into 'stable-3.1'

Till Brehm

2016-04-07 b203f3ee3774b6335e70f105172eba688fec28bb

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