@ajdawson, please don't let this stop you.
I was aware of your up-coming PR and thought you'd probably have it merged soon.
I just needed something here in the meantime.
I'll happily rebase this onto a new master that includes your work.