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