No delimiter comment between includes and first segment.
Have __PLUS4__ imply __C16__.
Made EXTZP segment option for modules.

This allows to remove the "add empty EXTZP segement to avoid warnings"
approach.
Merge remote-tracking branch 'upstream/master'