am 6573f1c7: merge in klp-release (no-op)

* commit '6573f1c77f56648a40b00ebe323eadafd7cc5157':