Merge pull request #78 from smillidge/master

Merge in Weld 2.2.7 final