Merge pull request #653 from op-jenkins/op_update_05_9-22-2016

op-build update 9-22-2016