Sync'd branch releases/b2g30_v1_4 with upstream @ Sat Aug 30 14:30:15 PDT 2014