Sync'd branch releases/b2g30_v1_4 with upstream @ Mon Oct 13 11:09:54 PDT 2014