Merge from DigitalPulseSoftware repository.