See 5. here.

@plammens I'll try and create a PR on sunday. But if your in the mood and don't see anything related to this issue, please go ahead - you're much more familiar with the changes than I am ;)