Sync'd branch releases/b2g30_v1_4 with upstream @ Thu Aug 28 08:58:37 PDT 2014