merged with trunk - revision 48238


git-svn-id: https://root.cern.ch/svn/root/branches/dev/ibucur@48240 27541ba8-7e3a-0410-8455-c3a389f83636