Merge pull request #2613 from cvswen/update_stable

op-build update 2-7-2019