merge in oc-release history after reset to f0fe59c53200f2840858125a252039fa14f20489
gitbuildkicker [Thu, 23 Mar 2017 00:11:12 +0000 (17:11 -0700)]

Trivial merge