Merge pull request #538 from gameblabla/fix_cdom_savestate