- upstream fixes (note: diff-trunk_src-from-r714-to-r716.diff replaced
  with git.patch)