Updating to latest Jedi dev branch

This should finally fix #599.