Flagging Tokens not working in Flag Actions

We setup a flag with flag fields, and enabled on a node. We then set an action to send an email when the node was flagged. The admin screen for creating the action shows flagging:field type tokens available, but they are not replaced when the email is sent. Looking in the action code it appears that flag_actions_flag_flag receives the flagging entity, but does not pass it on to flag_actions_do, because there is no parameter available in flag_actions_do. With this patch I add an optional flagging parameter to flag_actions_do that defaults to "FALSE", then if that parameter is passed in I add it to the context array for token replacement. Seems to fix it for me.