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

Trivial merge