Sync'd branch releases/b2g30_v1_4 with upstream @ Thu Sep 18 04:14:01 PDT 2014