Tweak how queue restarting works.
Merge remote-tracking branch 'remotes/origin/4.2'