Merge remote-tracking branch 'mesa-public/master' into vulkan

diff --cc configure.ac
Simple merge

diff --cc src/compiler/glsl/ast_to_hir.cpp
Simple merge

diff --cc src/compiler/glsl/glsl_parser_extras.cpp
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_compiler.h
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_fs.cpp
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_fs.h
Simple merge

diff --cc src/mesa/program/ir_to_mesa.cpp
Simple merge