merge frun trunk r49337


git-svn-id: https://root.cern.ch/svn/root/branches/v5-34-00-patches@49338 27541ba8-7e3a-0410-8455-c3a389f83636