Fix infinite recursion when unpickling a mapping type instance
Merge pull request #263 from batlock666/master

Fix infinite recursion when unpickling a mapping type instance