Merge branch 'master' into stimulus_issues

Conflicts:
	RecADCOnlyUnit.pas
Resolution:
        Both sets of comments kept.
        JD and I independently introduced Wait() procedure
(which I had copied from another of his .pas files anyway,
so they are identical except for whitespace); keeping JD
version.