Log Message: Note that 12946 really now is 3.0.4. Thanks to Ryan Ollos for creating a tag in the upstream repo.