fix bug in prompt display
Merge branch 'master' into 14.04