Cleaned up versions from the trunk.
Merge branch 'v5-34-00-patches' of https://root.cern.ch/git/root into v5-34-00-patches