TS now requires Sphinx 2.0.5 or better, so let's include the Riddle tweaks accordingly.

Closes #618.