merging upstream commits from Archetype master

current through pr #73