Added pill to prompt
Merge branch 'master' into next