Merge proposals

os-xenapi-bugs has no merge proposals.