merge changes in mesa noegl devel to devel