Merge pull request #440 from op-jenkins/op_update_4-14-2016

op-build update 4-14-2016