folding changes into working copy in wmaddisn that had been accidentally pulled into MesquiteProject