gimp update
Merge branch 'experimental/gimp-git' into refs/top-bases/experimental/gutenprint

* experimental/gimp-git:
  gimp update
Merge commit 'refs/top-bases/experimental/gutenprint' into experimental/gutenprint

* commit 'refs/top-bases/experimental/gutenprint':
  gimp update