yes :wink:  

@mdboom, just to clarify the procedure as I see it: if this is accepted we'll merge both this and astropy/astropy#2094 at the same time. (If it's not accepted, we merge this with "rejected" as the status and close astropy/astropy#2094 .  Although I certainly don't foresee that happening)