Creating template
Merge remote-tracking branch 'openshift/master'
Fixed patching to help with #3