Bug 906840
Merge pull request #1412 from bdecoste/master

Merged by openshift-bot