Test: Merge branch 'master' into dns-dnssec

A. Täffner

2016-01-27 08791fea529813a60987010b45533bd307990138

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