Update for 3.0.19, keeping the changes from 3.0.18