Merge commit 'mesa_7_6_branch' into mesa_7_7_branch