merge with trunk -  revision 48279  - see http://root.cern.ch/viewvc?rev=48279&root=root&view=rev


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