Sync'd branch releases/b2g30_v1_4 with upstream @ Wed Aug 27 12:28:25 PDT 2014