Prepping Defect 10 & 11
Merge github.com:PKSupport/OutOfMemory