[Mesa-stable] Cherry pick cad60420d for branch 10.2

[Laurent Carlier]

Please cherry pick cad60420d5ea36a4b6fa2e6c91317f71423aa63e  from master 
for branch 10.2, it fixes bug #83735 and ArchLinux bug #41918

https://bugs.freedesktop.org/show_bug.cgi?id=83735
https://bugs.archlinux.org/task/41918

Thanks
-- 
Laurent Carlier
http://www.archlinux.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.freedesktop.org/archives/mesa-stable/attachments/20140911/aec5a551/attachment.sig>