Merge branch 'master' into verilog-ams