Mobile SDK 2.1: Unstable to master merge