Rebasing master on the current draft... had to push this manually due
to conflicts in the edit stream (things got out of sync... need a
better workflow)