merge gdyh
merge (Step II)
(* unable to compile now, AI and translations undealt *)
Merge remote-tracking branch 'upstream/master'
merge
Merge remote-tracking branch 'upstream/master'
wired,i did not change any code
i did not change anything