Bug 912292
Merge pull request #1406 from danmcp/master

Merged by openshift-bot