Merge pull request #469 from op-jenkins/op_update_5-9-2016

op-build update 5-9-2016