Add memory fixes from uspteam SCM

Conflicts:
	debian/patches/00list