Sync'd branch releases/b2g30_v1_4 with upstream @ Fri Sep  5 03:33:27 PDT 2014