am 399fbc0: Merge change 818 into donut

Merge commit '399fbc0d87bbe4f2808cb582dc23f932432ea846'

* commit '399fbc0d87bbe4f2808cb582dc23f932432ea846':
  Changed the way we check the magic number in guard pages.