Merge pull request #705 from op-jenkins/op_update_05_10-25-2016

op-build update 10-25-2016