Applied patches sent in by Kevin Gao.
4 files changed