Update funfactory to latest master.