Pr 520 copy

@astearns - so it turns out git was able to handle the file moves by pulling & merging into a new branch in my fork.  gitHUB awesomely told me how to do it all. The only thing is that the old branch that is for pr #520 is no longer necessary, nor is that PR. I have to create a new PR with the merged changes, so that's what this is.   I'll have to repeat this for #521, #542 which were branched from 520.  I'll probably have to do the same for the  #531 and #547.  Despite this being a lot of words to describe the scenario, it was actually pretty easy to do after all and for you as the merger, it should be exactly the same.