Trac #2110