Merge pull request #2268 from hnyman/rrd