fixed bug with prompt header appearing when there's no prompt
Merge branch 'master' into release