This is in master already...