Update to latest Tolk which doesn't depend on protected_attributes

Fixes #1455