Fix compile warning
Merge branch 'master'