Merge pull request #597 from op-jenkins/op_update_8-24-2016

op-build update 8-24-2016