Updated to include patches in src tree