Hi Brian, thanks for reporting this and for proposing a fix, your fix is now in the maint branch: https://code.orgmode.org/bzg/org-mode/commit/5acf4d46
@Eric, let me know if there is something I overlooked while accepting Brian's fix, I tested the change and it looks good to me. Thanks, -- Bastien