Merge branch 'master' into dns-dnssec

A. Täffner

2016-01-20 cab3bca1d75be6c7f3140a35396d8c6ee2011801

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