Merge pull request #754 from op-jenkins/op_update_05_11-17-2016

op-build update 11-17-2016