This PR was merged in, but wasn't reviewed. It still needs a review. @ibilon
Yeah sorry, been busy. Right now I'm at the WWX, I'll look at the PRs when I get back.