mergeMap generics

Fixes issue #1550
Merge pull request #1558 from benjchristensen/issue-1550

mergeMap generics