Don't log this. It's too spammy.
Merge master. Fix conflict.