Auto-Merge pull request #3065 from btoneill/rrdcached