Merge branch 'master' into 'update_to_2021oct08'

# Conflicts:
#   LICENSE.txt
#   README.md
#   nmigen/test/utils.py
#   nmigen/vendor/xilinx_7series.py
#   setup.py

diff --cc README.md
index e30717c62ccd1c7552b61813fa4c1f313b2e11b8,29e68cba0b1711212054754cd6f48140297ddd55..07a8940a7aa725d6bd6bfdc8da69d7b09f75b7c7
--- 1/README.md
--- 2/README.md
+++ b/README.md
@@@ -12,9 -12,9 +12,9 @@@ Other nMigen libraries are built on FHD
  
  See the [doc/](doc/) folder for more technical information.
  
 -nMigen is based on [Migen][], a hardware description language developed by [M-Labs][]. Although Migen works very well in production, its design could be improved in many fundamental ways, and nMigen reimplements Migen concepts from scratch to do so. nMigen also provides an extensive [compatibility layer](#migration-from-migen) that makes it possible to build and simulate most Migen designs unmodified, as well as integrate modules written for Migen and nMigen.
 +nMigen 1.0 is based on [Migen][], a hardware description language developed by [M-Labs][]. Although Migen works very well in production, its design could be improved in many fundamental ways, and nMigen reimplements Migen concepts from scratch to do so. nMigen also provides an extensive [compatibility layer](#migration-from-migen) that makes it possible to build and simulate most Migen designs unmodified, as well as integrate modules written for Migen and nMigen.
  
- The development of nMigen has been supported by [SymbioticEDA][], [LambdaConcept][] and [M-Labs][].
+ The development of nMigen has been supported by [M-Labs][] and [LambdaConcept][].
  
  [migen]: https://m-labs.hk/migen
  [yosys]: http://www.clifford.at/yosys/

diff --cc nmigen/test/utils.py
Simple merge