Merge nan fill_value.
Merge pull request #1152 from bjlittle/merge_with_nan_fill_value

Merge nan fill_value.