Got the macro dialog working with previously selected macros in the rte and pre-fills the data that was previously there.
Merge remote-tracking branch 'origin/7.0.0' into 7.0.0