Merge pull request #444 from op-jenkins/op_update_4-21-2016

op-build update 4-21-2016