Merge pull request #925 from Oldiesmann/release-2.1

! Redo move topic stuff per comments on #921