! Redo move topic stuff per comments on #921.

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
! Clean up extra whitespace

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #925 from Oldiesmann/release-2.1

! Redo move topic stuff per comments on #921