2014-08-11 Babak Shafiei Merge r172422. 2014-08-11 Jer Noble [iOS]