merge in oc-release history after reset to master
gitbuildkicker [Thu, 23 Mar 2017 04:22:40 +0000 (21:22 -0700)]

Trivial merge