Merge proposals dependent on lp:~glmark2-dev/glmark2/fix-no-mapbuffer

lp:~glmark2-dev/glmark2/fix-no-mapbuffer has no merge proposals.