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

* commit '0c5933fe14a9c028055139375fc177221bc4ee82':
  Prevent the monkies with a sledgehammer