merge in oc-release history after reset to master
gitbuildkicker [Sun, 19 Feb 2017 08:10:14 +0000 (00:10 -0800)]

Trivial merge