Merge branch 'master' of https://github.com/sunpy/sunpy
Merge branch 'master' of https://github.com/wafels/sunpy