Cover a few more of the Revision branches / statements
Merge commit 'ba9ed828815778cdb222093f12f984568039178f' into HEAD