follow upstream
Merge branch 'experimental/gimp-git' into refs/top-bases/experimental/updates

* experimental/gimp-git:
  follow upstream
Merge commit 'refs/top-bases/experimental/updates' into experimental/updates

* commit 'refs/top-bases/experimental/updates':
  follow upstream