SYNC
Merge branch 'huahu' of https://github.com/huahu/sphinx into huahu