fix for linux compability too
Merge branch 'master' into testing