Merge branch 'fix-db-stats' into 'stable-3.1'

Till Brehm

2016-06-16 8225ad2d0778160477c5b23e6fc14d608578b796

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