Sync'd branch releases/b2g30_v1_4 with upstream @ Fri Aug 29 11:03:19 PDT 2014