Sync'd branch releases/b2g30_v1_4 with upstream @ Thu Sep 11 03:16:30 PDT 2014