Merge pull request #314 from op-jenkins/op_update_11-25-2015

op-build update 11-25-2015