Don't invalidate iterators again!
Merge remote-tracking branch 'remotes/origin/master' into SDL2_support