Here's a combined patch for this bug and bug #387796, applied and you get a menu like the screenshot above.
Here's a combined patch for this bug and bug #387796, applied and you get a menu like the screenshot above.