Merge branch 'feature/backup_stats' into 'master'

Marius Cramer

2015-01-05 307a78622c6a6b9b1a5a1dc51a8d54cf95e8a3c2

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