Merge "Merge remote-tracking branch 'remotes/mesa/17.2' into merge"