fixed linux build error
Merge branch 'master' into master_nutty_fixwrongcode
remove unused function
Merge pull request #4076 from nutty898/master_nutty_fixwrongcode

Master nutty fixwrongcode linux