Merge pull request #741 from op-jenkins/op_update_05_11-14-2016

op-build update 11-14-2016