Bring fork up to 4.5.40+