Merge pull request #6584 from aschempp/pullrequests/rootpaste