Ben Medlock

@jenrik Thanks for the help! I should have time this week to fix this.

@cyrilgdn Tests should now be passing. Thanks for your patience, everyone!

@cyrilgdn I've just fixed the conflicts on the branch. Everything should be good. Please could you take look?