am 244cdfa6: Merge "Prevent the monkies with a sledgehammer" into jb-dev

* commit '244cdfa6eb0745a4b681cb704f5564050d88f7ed':
  Prevent the monkies with a sledgehammer