Merge pull request #436 from op-jenkins/op_update_4-12-2016

op-build update 4-12-2016