The master diff is wonked: <https://github.com/pan...