Merge branch 'master' of git://git.pcp.io/kenj/pcp into kenj-merge