Merge pull request #702 from op-jenkins/op_update_05_10-21-2016

op-build update 10-21-2016