Merge proposals dependent on lp://staging/~peter-hutterer/evemu/misc-fixes

lp://staging/~peter-hutterer/evemu/misc-fixes has no merge proposals.