Switch to parser branch
Switch back to upstream jedi