Merge pull request #668 from op-jenkins/op_update_05_9-29-2016

op-build update 9-29-2016