Merge upstream, resolve conflicts

2019-11-04, qarkai