Merge fix bits from jc/rev-list