[mesa-freeworld] (11 commits) ...Merge branch 'master' into f40