# Performance bug - Initial patch partially reverted  2.5 Fix
(Regression) Thanks Thomas Hunziker
(Fix #1554)
Merge remote-tracking branch 'upstream/2.5.x' into 2.5.x