Mobile SDK Package: Merging master back to unstable