3.1.6

Merge branch 'release-3.1.6'

What's Changed

• tests showing how this could work by @TomPallister in #241
• Feature/fix #240 by @TomPallister in #243

Full Changelog: 3.1.5...3.1.6