Update to 2.8.5

changes were originally made by @woglinde