! Merging in everything patched in 2.0.6 that wasn't already fixed eithe...

...r directly or indirectly in 2.1 already.

Signed-off-by: Peter Spicer <sleeping@myperch.org>