Yet more fixes
Merge remote-tracking branch 'upstream/master' into wav29
Yet more draconic fixes 3.5004
Last minute change

Ensure it will work if dq,experence is mustard and allow another type of
feeding
Merge pull request #1106 from waveney/wav29

Version 3.5004