Merge pull request #1120 from wenxuwan/merge1.5to3.0

Mod: Merge 1.5 to 3.0