Back to 5.2.2-9-g3ec50f0
All previous changes in one commit