Bug 927618
Merge pull request #1805 from bdecoste/master

Merged by openshift-bot