Fix git PR and branching issues

I would fix this using git rebase if I could figure out how to do that
but I could not. If anyone wants to tell me how to get git to
incorporate a change from master into this branch then I would like to
know.