Fix for home_path when prompt_short is enabled.
Custom version 0.9.16.2-om8
Merge branch 'refs/heads/master' into 0.9.16.2-om8