Merge conflicted file in master into hb-install-system

I forgot to commit this file in 596640e.