Merge pull request #915 from op-jenkins/op_update_1024_3-13-2017

op-build update 3-13-2017