am c952d877: merge in klp-release (no-op)

* commit 'c952d877069bbb322d8b8362232e0c07a7e8ad1e':