Merge branches 'ns9x' and 'machtypes' into devel