Merge branch 'calc-patch-ext' into 'master'

Various extensions to the calculus patch

See merge request inducer/sumpy!100