Sync'd branch releases/b2g30_v1_4 with upstream @ Mon Aug 25 10:58:36 PDT 2014