updates
Merge commit '301e075a291ec4005dd12d12c13396f346dce05a' into experimental/gimp-git

* commit '301e075a291ec4005dd12d12c13396f346dce05a':