Bug 912819
Merge pull request #1423 from bdecoste/master

Merged by openshift-bot