am 0a660528: Merge "Goo goo ga joob." into klp-dev

* commit '0a660528374f0cf4fc24eb610ea048c99cbd27a1':
  Goo goo ga joob.