Text in Shape / Text on Path just got merged, just in time for 5.3 feature freeze. This was the last item for Phase 3 of the text tool.