Sync'd branch releases/b2g30_v1_4 with upstream @ Thu Aug 28 10:53:24 PDT 2014