Sync'd branch releases/b2g28_v1_3 with upstream @ Wed Aug 27 20:12:50 PDT 2014