Merge pull request #426 from op-jenkins/op_update_3-31-2016

op-build update 3-31-2016