Merged in branch bugfix-11914 of https://github.com/runrevmark/livecode.git.