Bug 923369
Merge pull request #1780 from bdecoste/master

Merged by openshift-bot