I rebased on master and squashed my commits. Unfortunately I saw the email about adding a commit to my PR until too late. So that is a separate commit.

Anyway, its all pushed to master