Sync'd branch releases/b2g30_v1_4 with upstream @ Thu Oct  2 18:06:34 PDT 2014