Merge remote branch 'origin/mesa_7_6_branch'