Pull in head from jsosic's mercurial repo