Merge branch 'xfs-quota' into 'stable-3.1'

Till Brehm

2016-04-24 bc6917486cdf177db87d9d6d1a2fad57bed17ce3

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