Filter SharePoint task list view to show tasks assigned to groups I am in

If you have a SharePoint task list where the task is assigned to a SharePoint group, you may notice that the My Task list does not show tasks even if you are a member of the group of which the task is assigned.
Before:
<where><eq><fieldref name="AssignedTo"/><value type="Integer"><userid type="Integer"/></value></eq></where>
After:
<where><or><membership type="CurrentUserGroups"><fieldref name="AssignedTo"/></membership><eq><fieldref name="AssignedTo"/><value type="Integer"><userid/></value></eq></or></where>