Sync'd branch releases/b2g28_v1_3 with upstream @ Thu Sep  4 05:50:26 PDT 2014