Merge pull request #700 from op-jenkins/op_update_05_10-20-2016

op-build update 10-20-2016