Merge branch 'master' into stable

# Conflicts:
#	CHANGELOG.md
#	Cargo.toml
#	examples/sdl/Cargo.toml
#	examples/web/index.ts
#	examples/web/package.json
#	examples/web/react/components/keyboard-chip8/keyboard-chip8.tsx
#	examples/web/react/components/keyboard-gb/keyboard-gb.tsx