Merge tag 'v4.4.25' into v4.4-rt

This is the 4.4.25 stable release