[mesa-freeworld/f39] (7 commits) ...Merge branch 'master' into f39