Bug 990090
Merge pull request #3224 from danmcp/master

Merged by openshift-bot