Temporary fix for sphinx fails on Travis
Merge branch 'master' of https://github.com/sunpy/sunpy into issue766