#174 #33 #149 cleanup sphinx

2 jobs for 174-sphinx in 31 minutes and 15 seconds (queued for 19 seconds)