Merge commit '2983e038d189a257f1e5abb9c120bd1feb253773' * commit '2983e038d189a257f1e5abb9c120bd1feb253773': Fix a deadlock I ran into.
Merge commit '2983e038d189a257f1e5abb9c120bd1feb253773' * commit '2983e038d189a257f1e5abb9c120bd1feb253773': Fix a deadlock I ran into.