Sync'd branch releases/b2g30_v1_4 with upstream @ Tue Sep 23 07:15:01 PDT 2014