asfd
Merge remote-tracking branch 'github/testing' into testing

Conflicts:
	prng/prng.h
asdf