Bug 896366
Merge pull request #3212 from danmcp/master

Merged by openshift-bot