Merge branch 'master' into mwk/xilinx_bufgmap

diff --cc CHANGELOG
Simple merge

diff --cc techlibs/xilinx/synth_xilinx.cc
index 00849ad008d09e89c602fb10e4b4131af6f6e150,87f4af8f7daa008def5363a46aa74c0b101e4dfe..f058da83d2cca7253582b1a2ab5bede2699a99f5
--- 1/techlibs/xilinx/synth_xilinx.cc
--- 2/techlibs/xilinx/synth_xilinx.cc
+++ b/techlibs/xilinx/synth_xilinx.cc
@@@ -116,7 -104,8 +116,8 @@@ struct SynthXilinxPass : public ScriptP
        }
  
        std::string top_opt, edif_file, blif_file, family;
 -      bool flatten, retime, vpr, nobram, nolutram, nosrl, nocarry, nowidelut, abc9;
 +      bool flatten, retime, vpr, ise, iopad, noiopad, noclkbuf, nobram, nolutram, nosrl, nocarry, nowidelut, abc9;
+       bool flatten_before_abc;
        int widemux;
  
        void clear_flags() YS_OVERRIDE