Fix bug 983583
Merge pull request #3061 from pmorie/dev/upgrades

Merged by openshift-bot