Merge branch 'xs64bit'

Merge from product branch Creedence

Signed-off-by: Thanos Makatos <thanos.makatos@citrix.com>