Merge branch 'jc/rev-list-options-fix' into maint