Creating template
Merge remote-tracking branch 'openshift/master'
Openshift stuff