Bug 921902
Merge pull request #1764 from bdecoste/master

Merged by openshift-bot