Merge pull request #1546 from evincarofautumn/faster-binprot