Allowed persistence of custom properties when resetting envelope state.
Merge pull request #73 from garbetjie/master

Allowed persistence of custom properties when resetting envelope state.