Merge branch 'move-expansion-radii' into 'deprecate-where'

# Conflicts:
#   pytential/qbx/__init__.py
#   pytential/symbolic/primitives.py