amend #468 to explicitly stop master (rather then relying on later clean up)