Merge branch 'en/prompt-under-set-u'

The bash prompt script (in contrib/) did not work under "set -u". * en/prompt-under-set-u: git-prompt: work under set -u