Bring fork up to date with 4.0.3.