Merge pull request #752 from valentinewallace/chanman-persistence