Merge branch 'core-1.3-updates' into release
[philo.git] / contrib / waldo / __init__.py