Don't raise warning on merging int and float with nan#21011

Merged

jreback merged 1 commit intopandas-dev:masterfrom

jorisvandenbossche:merge-nan-no-warning

May 11, 2018

Commits on May 11, 2018

Don't raise warning on merging int and float with nan
jorisvandenbossche
committed