Mobile SDK: Merging master into unstable