Merge branch '7.1' into 7

[GuySartorelli]

Tried pushing directly to 7 but got the response

remote: error: GH006: Protected branch update failed for refs/heads/7.
remote: error: Changes must be made through a pull request.
! [remote rejected] 7 -> 7 (protected branch hook declined)
error: failed to push some refs to 'github.com:tractorcow-farm/silverstripe-fluent.git'

This is just a straight merge up from 7.1 to 7.
There was a merge conflict in yarn.lock which was resolved by running yarn install. Running yarn build afterwards yielded no change to dist files.