am ff7f43eb: am bb6fd7ff: Merge "Shut.  Up." into klp-dev

* commit 'ff7f43eb08e3f2d98e7b8f09e733ef015e3fe168':
  Shut.  Up.