#Fix generating sphinx config
#Fix sphinx query ordering
Merge branch 'fixes'