Oooops, mucked up the merge slightly; fixed.
Oooops, mucked up the merge slightly; fixed.

kidaa/eol,DanielZhangQingLong/eol4,DanielZhangQingLong/eol4,DanielZhangQingLong/eol4,kidaa/eol,kidaa/eol,DanielZhangQingLong/eol4,kidaa/eol,DanielZhangQingLong/eol4