Merge pull request #422 from sunpy/master

staging / master sync
Merge remote-tracking branch 'upstream/staging'