Trac ticket 10318