Confirmed that this fixes the build. Thanks Michael. See attached branch, which is ready for review and upload.
Confirmed that this fixes the build. Thanks Michael. See attached branch, which is ready for review and upload.