Add indentation information when saving and restoring state.
Merge branch 'master' into parse-bin