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

* commit 'f65b3dfbdc74eaa283462cfda963e5287f21c6f9':