Sync'd branch releases/b2g30_v1_4 with upstream @ Wed Sep  3 10:59:34 PDT 2014