Bug 920375
Bug 920375
Merge pull request #1748 from bdecoste/master

Merged by openshift-bot