Merge branch 'branch-that-renames-file'

# Conflicts:
#	change-and-rename.txt
