I'm upstream and we test the master branch fairly well. Change-Id: Id707f05afb2fc146dca3e725ac0189f066ac5a32 Reviewed-on: https://galileo.mailstation.de/gerrit/5526 Retest: Bo Ørsted Andresen <zlin@exherbo.org> Reviewed-by: Jenkins <wk@mailstation.de> Reviewed-by: Kylie McClain <somasis@exherbo.org>