BZ906845
BZ906845
BZ906845
Merge pull request #1285 from bdecoste/master

Merged by openshift-bot