v0.22
Merge remote-tracking branch 'openshift/master'