Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	CHANGELOG
#	frontends/verific/verific.cc
#	frontends/verilog/verilog_parser.y

diff --cc CHANGELOG
index 5499c309afb83c41ac744bbb4ec29b5c3b320324,42e01645e4839e0ea021edd1f002c6a43ed99f72..5d3b9a5cbd3efd6ff8faedf55ef10971d9c4d24c
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -3,6 -3,21 +3,22 @@@ List of major changes and improvements 
  =======================================================
  
  
+ Yosys 0.8 .. Yosys 0.8-dev
+ --------------------------
+ 
+  * Various
+     - Added $changed support to read_verilog
+     - Added "write_edif -attrprop"
+     - Added "ice40_unlut" pass
+     - Added "opt_lut" pass
+     - Added "synth_ice40 -relut"
+     - Added "synth_ice40 -noabc"
+     - Added "gate2lut.v" techmap rule
+     - Added "rename -src"
+     - Added "equiv_opt" pass
+ 
+ 
++>>>>>>> upstream/master
  Yosys 0.7 .. Yosys 0.8
  ----------------------