Merge master from https://github.com/VSoftTechnologies/DUnitX