Bug 902286
Merge pull request #1224 from danmcp/master

Merged by openshift-bot