Mobile SDK Package: Merging master into unstable