Merge pull request #584 from op-jenkins/op_update_8-16-2016

op-build update 8-16-2016