Merge pull request #1139 from wghoffa/master

op-build update 06-09-2017