Merge branch 'master' of ssh://gitlab.tiker.net/inducer/pyopencl