Code

Apply patch from mba for Trac #2644