Bug 895507
Merge pull request #1454 from bdecoste/master

Merged by openshift-bot