Bug 903139
Merge pull request #1204 from danmcp/master

Merged by openshift-bot