am 1870780b: am 455db5df: merge in klp-release (no-op)

* commit '1870780b00f0202ee3c81a33cfa7cb3df98e3ed0':