I've added it myself and committed it as 70b41d2 - since the builds were breaking, I didn't want to wait. I'll try to test the other part of this PR later today/this week.