Little fix copied from Jelmer's integration branch, want to import the rest after doing this devel release because there are quite a lot of changes in it.
