Sync'd branch releases/b2g30_v1_4 with upstream @ Thu Oct  9 10:22:47 PDT 2014