Merge pull request #774 from op-jenkins/op_update_05_12-12-2016

op-build update 12-12-2016