squashed commit of the master branch

git-svn-id: https://svn.r-project.org/ESS/trunk@5978 0bbaf3bd-34e0-0310-bf65-c717079852d4