Bring fork up to date with upstream

Brings this fork up to date with the upstream master.