Revise PROMPT2
Merge branch 'master' into linux