Merge tag 'v4.1.13' into master-4.1.13

This is the 4.1.13 stable release