Merge pull request #881 from ebressert/master (manual merge)
drop all -qs
Merge branch 'staging' of github.com:eteq/astropy into staging