This issue is resolved in 3.6, I'm tempted to mark it Fix Released, but does it still need to be backported to 3.5?
This issue is resolved in 3.6, I'm tempted to mark it Fix Released, but does it still need to be backported to 3.5?