Merge remote-tracking branch 'upstream/master' into datestring_offset_indexing

Author: Matt Roeschke

pandas/core/frame.py

@@ -7236,7 +7236,7 @@ def count(self, axis=0, level=None, numeric_only=False):
  If the axis is a `MultiIndex` (hierarchical), count along a
  particular `level`, collapsing into a `DataFrame`.
  A `str` specifies the level name.
- numeric_only : boolean, default False
+ numeric_only : bool, default False
  Include only `float`, `int` or `boolean` data.
 
  Returns