Merge branch 'pwd-length' into 'stable-3.1'

Till Brehm

2016-04-07 9ae44824aa54f4c68db9490dec8d93f17945b1f7

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