Upstream merge: conflict resolution and version bump
Process conversation input on the main thread. BUKKIT-5611