Merge branch 'tobi-master' into create-with-source-data

diff --cc src/rrd_client.c
Simple merge

diff --cc src/rrd_daemon.c
Simple merge