@timothypovich and @aron. After I merged master into this branch, the only changes are these whitespace changes. It looks like there are not really any changes on this branch. Should we close this out and delete it?