Merge remote-tracking branch 'origin/master' into dwc2-split-sched

# Conflicts:
#	test/unit-test/project.yml