Merge pull request #1066 from wghoffa/witherspoon_0508

op-build update 5-8-2017