Merge branch 'greg_counters' into v4-dev

Conflicts:
	ip_cores/wr-cores
	top/bare_top/scb_top_bare.vhd

general-cores @ 18fa7851

-Subproject commit 4481315c88ba746c31f71e4128aac5a1df0022fd
+Subproject commit 18fa7851a47d149d5562a92e0fa36b05286628e0

wr-cores @ 67cd9ce0

-Subproject commit 0362f910fa5f7268c6101ae0940553c7bab02bfc
+Subproject commit 67cd9ce053e3b3a43f0f4d29b1b03bb5ec61861f

top/bare_top/scb_top_bare.vhd

@@ -955,6 +955,7 @@ begin
   gen_no_dummy_rmon: if(c_DUMMY_RMON = false) generate
     cnx_master_in(c_SLAVE_DUMMY).ack <= '1';
   end generate gen_no_dummy_rmon;
+
   -----------------------------------------------------------------------------
   -- Interrupt assignment
   -----------------------------------------------------------------------------