Fix ROOT-5884
Merge branch 'master' of https://root.cern.ch/git/root