Release 0.8.5 (50)

Also some other gitmerge fixes