Merge pull request #571 from op-jenkins/op_update_8-5-2016

op-build update 8-5-2016