am 6ddd2009: am 587fa0b4: am 565caebc: merge in klp-release (no-op)

* commit '6ddd2009ce3593e3df4bc4b5ce739210e68ccbac':