am 56cbb587: merge in klp-release (no-op)

* commit '56cbb5872a5b48815311f2c6a1a3292682a56afa':