Er, wait, @rgbkrk already merged this. Just a sec.