Even better :-)

@RobLoach, are we ready to merge?

As this is a major change in library behavior, I'd recommend to commit it as the start of a new 2.x major version.