Merge branch 'ci-fixes'

Backport a couple fixes to make the CI build run again (so much for
reproducible builds...).

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

Author: dscho