merge in klp-release history after reset to master