Merge "Update script to copy in extra generated files."