Merge branch 'MDL-46332-grouping-remove-button-master' of git://github.com/DanBennett...