Unasync Abiquo (cherry pick into master)

This is the cherry pick for #81.