Merge pull request #1099 from wilbryan/master

Update OCC 5/22/17