aux 3.9 updates
Merge pull request #1564 from tdykstra/working

aux 3.9 updates - for publication ASAP