FIX: broken mem entry
Merge remote-tracking branch 'origin/fannie-prep-statements' into fannie-prep-statements