Merge pull request #717 from op-jenkins/op_update_05_11-1-2016

op-build update 11-1-2016