Merge pull request #322 from op-jenkins/op_update_12-15-2015

op-build update 12-15-2015