merge branch 'pr-358'
merge branch 'pr-358'

Closes #358
LGTMs: da39a3ee5e6b4b0d3255bfef95601890afd80709@cyphar

rhatdan/cri-o,mheon/cri-o,umohnani8/cri-o,mheon/cri-o,apilloud/cri-o,vbatts/cri-o,mikebrow/cri-o,jwhonce/ocid,kubernetes-incubator/cri-o,rhatdan/cri-o,nalind/cri-o,kubernetes-incubator/ocid,kubernetes-incubator/cri-o,intelsdi-x/cri-o,14rcole/cri-o,aweiteka/cri-o,umohnani8/cri-o,kubernetes-incubator/cri-o,mikebrow/cri-o,umohnani8/cri-o,14rcole/cri-o,apilloud/cri-o,sameo/cri-o,sameo/cri-o,jwhonce/ocid,mikebrow/cri-o,kubernetes-incubator/ocid,umohnani8/cri-o,mheon/cri-o,apilloud/cri-o,sameo/cri-o,vbatts/cri-o,mikebrow/cri-o,aweiteka/cri-o,14rcole/cri-o,rhatdan/cri-o,jawnsy/cri-o,vbatts/cri-o,nalind/cri-o,jawnsy/cri-o,intelsdi-x/cri-o,nalind/cri-o,vbatts/cri-o,kubernetes-incubator/cri-o,intelsdi-x/cri-o,aweiteka/cri-o,jawnsy/cri-o,14rcole/cri-o,mheon/cri-o,rhatdan/cri-o,kubernetes-incubator/ocid,jwhonce/ocid