Merge branch 'master' into gilbert
[philo.git] / loaders / __init__.py