I'm pleased to report that the Moodle fix for this issue was included in this week's release of Totara v1.1.15 and v1.0.36