Merge branch 'gl-barrier-hacks' of gitlab.tiker.net:mattwala/loopy-gl-barrier into gl-barrier-hacks