[ HACKING ] Refined git instructions to merge bugfixes.
Merge branch 'maint-2.4.0'