templating.unload(templateName) should also call $reset('rhtml', templateName, null) to remove from cache
Merge commit 'f00c9781fa51d54cd3baaff4b4f4cf0bd0c5557c'