Merge pull request #726 from khawkins/unstable

Mobile SDK: Merging master to unstable