Fix: https://sft.its.cern.ch/jira/browse/ROOT-4999
Merge branch 'master' of https://root.cern.ch/git/root