Sync'd branch releases/b2g30_v1_4 with upstream @ Mon Oct  6 20:16:46 PDT 2014