Merge proposals dependent on lp:~thomas-voss/glmark2/mir-no-deprecated-functions

lp:~thomas-voss/glmark2/mir-no-deprecated-functions has no merge proposals.