Patches including fix for #1