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