Mackup 0.6.1

Closes #26781.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>