fixed list iterator erase/increment bug
Merge branch 'master'