Bug 980928
Merge pull request #3014 from lnader/stage

Merged by openshift-bot