Merge pull request #272 from mikeh/master

MOBSDK-708: Workaround for ACE-1445