Merge branch 'pryor'