Merge branch 'aps_remote' into 'master'

Marius Cramer

2015-01-05 551989a9bd9b134858f6709a2756ca9dcec82fd4

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