[Do Not Merge] Testing merge commit detection

[hughsaunders]

This won't be merged, just testing that the github action correctly identifies the merge commit in this branch.

[hughsaunders]

First test failed, will modify and retry.

[codeclimate[bot]]

Code Climate has analyzed commit 4175ca83 and detected 0 issues on this pull request.

The test coverage on the diff in this pull request is 100.0% (50% is the threshold).

This pull request will bring the total coverage in the repository to 90.0% (-1.5% change).

View more on Code Climate.