upstream added tag, I think this is now ready for merge