Sync'd branch releases/b2g30_v1_4 with upstream @ Sun Aug 24 20:37:24 PDT 2014