Sync'd branch releases/b2g30_v1_4 with upstream @ Sat Aug 30 08:02:34 PDT 2014