Bug 1021380
Merge pull request #4166 from danmcp/master

Merged by openshift-bot