Merge pull request #286 from mikeh/master

MOBSDK-718