Merge "Fix bad permission string" into pi-dev