Merge pull request #399 from op-jenkins/op_update_3-21-2016

op-build update 3-21-2016