Mobile SDK: Merging master to unstable

Looks like we missed a (nominal—changes already reflected) merge from master to unstable.  Housecleaning.