another fix for building on ubuntu
Merge remote-tracking branch 'origin/master'