Patch pushed as fbec026f420ea5b672c889d6475d49aa961d9bad. Thanks.