Fixing undef warnings in --dump (fixes #245).
Merge branch 'dev' into kessel