Merge pull request #438 from bitwangyaoyao:2.4_fixwarings