Merge branch 'dscho-assorted-git-artifacts-fixes'

This is needed for the next change, where we add HOST_CPU support to the
CMake definition.

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho