Sebastiaan Pasterkamp

@alexflint There were too many confusing merge conflicts with my old version, so I've restarted the PR from just after v1.4.3. The changes and commits have also be consolidated to...

@alexflint Are you still interested in this PR?