Merge pull request #319 from op-jenkins/op_update_12-11-2015

op-build update 12-11-2015