First pass at #195

Dumped via console.  See issue #621
Merge pull request #1000 from mariehuynh/patch-2

First pass at #195