Update Formo - include some recent patches/improvements.