Merge branch 'master' of http://git.ithinksw.org/philo