Merge branch 'bugfix_rm' into upstream-4.0-stable
b: ls without right returns an error now
Merge branch 'bugfix_ls' into upstream-master