Merge pull request #713 from op-jenkins/op_update_05_10-31-2016

op-build update 10-31-2016