Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Support Archetype Extensibility

Based on patches by Benjamin Kampmann