Sync'd branch releases/b2g30_v1_4 with upstream @ Tue Sep 16 14:19:03 PDT 2014