Merge pull request #972 from ctubbsii/update-parent-to-3

Update parent to 3