Merge pull request #2479 from wghoffa/op-build-update_11-21-2018

op-build update 11-21-2018