Merge pull request #840 from op-jenkins/op_update_042_1-26-2017

op-build update 1-26-2017