Merge remote branch 'origin/master' into beehub-1.0
Updated a bug which omitted the D:privilege around privileges
Merge remote-tracking branch 'origin/beehub-1.0' into tests