Bug 917713
Bug 917713
Merge pull request #1541 from bdecoste/master

Merged by openshift-bot