Sync'd branch releases/b2g30_v1_4 with upstream @ Wed Sep 17 07:39:02 PDT 2014