Merge pull request #191 from mikeh/master

MOBSDK-615, MOBSDK-626, MOBSDK-627, MOBSDK-628