merge from trunk 49286: fixes for ROOT-4889 and  ROOT-4890 
and also merge 49287 (new tutorial version)


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