Merge branch 'jc/add-p-unquote'