Merge pull request #398 from op-jenkins/op_update_3-18-2016

op-build update 3-18-2016