Merge remote-tracking branch 'openshift/master'