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

* commit 'be662187aa579970cda4af49affd31958efc137c':