Sync'd branch releases/b2g30_v1_4 with upstream @ Fri Aug 29 06:59:26 PDT 2014