Merge branch 'gilbert' of git://github.com/lapilofu/philo into gilbert