5.2.2-12-g6b4950e
All previous changes in one commit