astropy/astropy-helpers — pull request #99 by astrofrog (2014-10-22 08:58:52+00:00)
Title: Backported version of astropy-helpers#91

@embray - does this look right? Or should I just cherry-pick the merge commit for #91 and then adjust it as needed?