Merge "OK, now it's a release." into klp-dev