Bug 987872
Merge pull request #3153 from danmcp/master

Merged by openshift-bot