Empty tokens not replaced in filtered text when field is blank

Line 1664 of entityform.module reads as follows:

$text = token_replace($text, $token_types);

I think it needs to be:

$text = token_replace($text, $token_types, array('clear' => TRUE));

From https://api.drupal.org/api/drupal/includes%21token.inc/function/token_re...

"clear: A boolean flag indicating that tokens should be removed from the final text if no replacement value can be generated."

Explanation:

I have an entityform with a token "Work phone: [current-user:profile-addresses-email:field-work-phone]" in the "Intro form instructions" field. (I'm trying to show the user what information we have on file in case changes are necessary.)

If "field-work-phone" has a value, the token is replaced correctly. If it's empty, it's returning the token string itself. so the user sees something like:

Work phone: [current-user:profile-addresses-email:field-work-phone]

That's not right, is it? Methinks it's better to show nothing instead of the unreplaced token.

This is a filtered text field using CKeditor if that matters, but I tried it as other formats with the same outcome.

Patch coming momentarily for your consideration.