Ca 101788

Already accepted in trunk: https://github.com/xen-org/xen-api/pull/1111