Sync'd branch releases/b2g30_v1_4 with upstream @ Mon Aug 25 12:33:25 PDT 2014