yarp-config --diff now uses an external diff tool
Merge remote-tracking branch 'origin/master' into yarprun_log