Fix a regression from last commit.
Updates from Adaptagrams repository.
Merge github.com:mjwybrow/dunnart