Just a tiny amount of more unit test coverage
Merge branch 'master' into unstable_staging