Mobile SDK 2.3.1 patch
Merge pull request #769 from khawkins/master

Mobile SDK 2.3.1 patch