Created branch bug-f214b8 with first draft patch
fixing the script-only demo.  Would appreciate more
eyes, testing and comments before merging to trunk
(and considering for backport).