Merge remote-tracking branch 'upstream/master'

Conflicts:
	modules/genrams/genram_pkg.vhd
	modules/wishbone/wishbone_pkg.vhd