Thanks to Trac alias Markush2010 and ross for the detailed reports. Backport of 3cbb7590cb from master