Normalize away extra empty line after method docstring.
Merge remote-tracking branch 'upstream/master'