Merge 'heads/0.6': mv 2>/dev/null is not a good idea if mv wants to ask questions...