Merge branch upstream/master
Merge branch 'incremental-lexing' of https://github.com/dungpa/PowerTools into incremental-lexing