Attempt to merge and commit.

Merge branch 'jwestgard-master'