Merge "Add missing null terminator for getopt_long()"