Sync'd branch releases/b2g28_v1_3 with upstream @ Sat Aug 30 14:29:22 PDT 2014