fixing erase in GroupMatrix::Prune in Windows
Merge branch 'next' into relay_message_fix