fixed a test that broke on postgres.
Merge branch 'master' into perms