git bash prompt didn't update
Merge branch 'master' into linux-gnu