Merge "Fix make-release.sh"