Sync'd branch releases/b2g30_v1_4 with upstream @ Fri Sep  5 06:49:35 PDT 2014