Update jpolly and pollyd from maxwen