Merge pull request #759 from jsmith2/4.2_integration

4.2 integration