Merge branch 'gilbert' of https://github.com/melinath/philo into gilbert