Merge pull request #42 from openshift/master

Syncing Origin & Online branches
Merge pull request #43 from openshift/online

Merge pull request #42 from openshift/master