Merge "Goo goo ga joob." into klp-dev