Pre-merge branch for batch of changes

Created by: scarlehoff

Dummy branch to merge the latest changes to a single branch and run tests before merging to master.

Incidentally, I just found a bug either on the way github calls the workflow or the way in which we configured it.