afe243f3c9
Base the update on r-ryantm's automatic work. Remove the already included patch.
Base the update on r-ryantm's automatic work. Remove the already included patch.