Merge branch 'main' into v2.17.x

diff --cc src/lib/player.cc
Simple merge

diff --cc src/tools/dcpomatic.cc
Simple merge

diff --cc src/tools/dcpomatic_batch.cc
Simple merge

diff --cc src/wx/full_config_dialog.cc
Simple merge

diff --cc test/data
index 515c71604fe16cc95a5f240b0333f78f47b9ea97,704f7643393caa29d77ddba138bff3642b273c46..a5b12872bf034712039414fad58e7e68c068b772
--- 1/test/data
--- 2/test/data
+++ b/test/data
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 515c71604fe16cc95a5f240b0333f78f47b9ea97
 -Subproject commit 704f7643393caa29d77ddba138bff3642b273c46
++Subproject commit a5b12872bf034712039414fad58e7e68c068b772

diff --cc wscript
index 86eb5562b1ddb39f1ce431bbaef678503ddb1e87,26859789a568ede1f71ba8de178d94d034c5677f..f6907f3a20c858c4b4aec1040bf2ca7ae0917483
--- 1/wscript
--- 2/wscript
+++ b/wscript
@@@ -76,9 -76,9 +76,10 @@@ def options(opt)
      opt.add_option('--workaround-gssapi', action='store_true', default=False, help='link to gssapi_krb5')
      opt.add_option('--use-lld',           action='store_true', default=False, help='use lld linker')
      opt.add_option('--enable-disk',       action='store_true', default=False, help='build dcpomatic2_disk tool; requires Boost process, lwext4 and nanomsg libraries')
 +    opt.add_option('--enable-grok',       action='store_true', default=False, help='build with support for grok J2K encoder')
      opt.add_option('--warnings-are-errors', action='store_true', default=False, help='build with -Werror')
      opt.add_option('--wx-config',         help='path to wx-config')
+     opt.add_option('--enable-asan',       action='store_true', help='build with asan')
  
  def configure(conf):
      conf.load('compiler_cxx')