Merge branch 'master' of https://github.com/kmcdonell/pcp into kenj-merge