$ 0 0 3.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: David Turner <novalis@novalis.org> commit a4d