Merge pull request #706 from op-jenkins/op_update_05_10-26-2016

op-build update 10-26-2016