Merged upstream into our fork

Placeholder for discussion, I'm not entirely sure why we're using such an old
fork to begin with.