am 90673b9d: Merge "Monkeys are touching my destroyed stuff" into jb-dev

* commit '90673b9d0e33de1162a671995796171ba953d35d':
  Monkeys are touching my destroyed stuff