Merge remote branch 'origin/bug_348_dvdburn_residenttask' into experimental