Merge pull request #535 from khawkins/unstable

Mobile SDK: Merging master into unstable