Bug 927192
Merge pull request #1800 from bdecoste/master

Merged by openshift-bot