Merge branch 'newpotter'