Code

Merge commit 'b319ef7' into jc/maint-fix-test-perm