Please do not merge - i am using the test harness to check for errors.  ...

...Fixes #4150