Merge pull request #606 from op-jenkins/op_update_8-31-2016

op-build update 8-31-2016