Prepare for Blaze changes in 0.9.1

(The relevant version of Blaze is on the
blaze-templates branch at the moment)