Merge pull request #464 from khawkins/master

Mobile SDK 2.1: Unstable to master merge