Merge "update-makefiles.sh"