Merge pull request #1895 from bdecoste/master

Merged by openshift-bot