preserve ICLASS in ci->target_class; fix #2657; ensuring #1467 #1470 #1493 still works
Merge branch 'master' into iij