Code

Merge git-mv fixes from 'maint'