Merge pull request #719 from khawkins/unstable30

Mobile SDK: Merging unstable into unstable30