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