Merge branch 'fix-bool-float-no-coercion' of https://github.com/aschade/pandas into fix-bool-float-no-coercion

# Conflicts:
#	pandas/core/frame.py

Author: aschade