Merge pull request #765 from op-jenkins/op_update_05_12-1-2016

op-build update 12-1-2016