Merge branch 'master' of gitlab.tiker.net:inducer/sumpy into rscale