am 4d9c9bd5: merge in klp-release (no-op)

* commit '4d9c9bd5cc5f81954b1e9724d125b8947b412b04':