Sync'd branch releases/b2g30_v1_4 with upstream @ Tue Sep  9 10:02:35 PDT 2014