what the hell, openshift
Merge remote-tracking branch 'openshift/master' into openshift