am 565caebc: merge in klp-release (no-op)

* commit '565caebcfc6ba053bbd765cdc9da63b38530c22e':