Fixed naming clash for roster help
Merge branch 'master' into nextdev