fix build error on ubuntu
Merge branch 'master' into dev