Merge pull request #643 from op-jenkins/op_update_05_9-15-2016

op-build update 9-15-2016