Taken from upstream. Our mesa-git is pretty outdated, we should update it soon. But we need to unblock the repository first, so this is the fastest way for now.
