Merge pull request #3012 from apwilson/leave

Leave all entered targets when finishing.