Merge remote-tracking branch 'upstream/eight' into test

This merge aims to simplify submissions to master and to eight, however
not everything eight has is not necessarily compatible with master,
hence merge errors will happen, though the contributor will not have to
go through all the commits that took place [years ago].