Sync'd branch releases/b2g30_v1_4 with upstream @ Fri Aug 29 10:47:23 PDT 2014