Unasync Abiquo
Merge pull request #85 from nacx/unasync-abiquo-master

Unasync Abiquo (cherry pick into master)