include patches from scrutinizer.com