Updated to latest base: first implementation of util.template