Merge "Shut.  Up." into klp-dev