Updating to latest upstream Jedi (dev branch)

This fixes #599.