merge in oc-release history after reset to master
gitbuildkicker [Mon, 13 Feb 2017 21:22:18 +0000 (13:22 -0800)]

Trivial merge