Merge pull request #1111 from op-jenkins/op-build-update_1348_5-25-2017

op-build update 5-25-2017