Bug 982738
Merge pull request #3197 from danmcp/master

Merged by openshift-bot