bugfix:  omitted modifications from mc16s change
Merge remote-tracking branch: upstream/master