This should actually have been in master before 0.2001. I forgot to pull the commit out...