Merge pull request #718 from khawkins/unstable

Mobile SDK: Merging master to unstable