Sync'd branch releases/b2g30_v1_4 with upstream @ Wed Aug 27 20:13:42 PDT 2014