Merge pull request #565 from sunpy/master

balls
Merge pull request #566 from sunpy/stable

Merge pull request #565 from sunpy/master