Merge branch 'portability'

Conflicts:
	include/pkmds/pkmds_g5.h