Update to latest astropy-helpers
Merge pull request #2519 from astrofrog/update-astropy-helpers

Update to latest astropy-helpers