5.2.2-15-g8d3508e
All previous changes in one commit