Merge pull request #42 from openshift/master

Syncing Origin & Online branches