memory.h fix for generic builds.
Merge branch 'bleeding-jumbo' into memdbg

* bleeding-jumbo:
  memory.h fix for generic builds.