fix prompt git status detection
Merge branch 'master' into 14.04