Clone of @boredzo's Mercural repo (not auto-updated) with my changes