Proper --encoding support for EFS. Also fixes a bug with uninitialized data.
Merge branch 'bleeding-jumbo' into memdbg

* bleeding-jumbo:
  Proper --encoding support for EFS. Also fixes a bug with uninitialized data.