update to use 3.16 patches