I've stayed away from this because because it gets a little convoluted--it seems easier to repeat the message that in astropy you should never work on master.

If you feel strongly about I can put it in.