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

* commit 'f28c9d5b07dca8f2998e161aeda44761b54438cc':