BUG: shortest_path overwrite
ENH: diagonals of coo_matrix
MAINT: setdiag edge cases and enable coo setdiag tests
BUG: signal: fix handling of multi-output systems in ss2tf.  Closes gh-2669
DOC: signal: Use 'two-dimensional' instead of 'rank-2'.
BUG: stats: Fix ValueError message in chi2_contingency.

chi2_contingency raises a ValueError when a zero occurs in the
table of expected frequencies.  The exception message includes
the position of the zero, but the code that figured out that
position was incorrect.
Merge pull request #3862 from WarrenWeckesser/bug-ss2tf

BUG: signal: fix handling of multi-output systems in ss2tf.
MAINT/DOC: Whitespace tweaks in several docstring.

The changes fix 12 "Unexpected indentation" warnings that
occur when building the HTML documentation with Sphinx 1.2.2.
Merge pull request #3906 from WarrenWeckesser/fix-doc-warnings

MAINT/DOC: Whitespace tweaks in several docstrings.
MAINT: Add a 'count_nonzero' function to use with numpy 1.5.1.
MAINT: linalg: use count_nonzero from lib._numpy_compat
MAINT: optimize: use count_nonzero from lib._numpy_compat in _linprog.py
MAINT: sparse.linalg: use count_nonzero from lib._numpy_compat
Merge pull request #3891 from WarrenWeckesser/bug-chi2conting-zeropos

BUG: stats: Fix ValueError message in chi2_contingency.
TST: bump test tolerance for linalg.orth test a little.

Fixes failure observed on OS X.
TST: fix test errors in sparse tests that compare NaNs.  Closes gh-3901.

Note that only __gt__ currently raises a warning, __lt__ doesn't. This is an
inconsistency in numpy it looks like.
Update HACKING.rst.txt

Link for scikit-image webpage was wrong, with an additional 's'.
Merge pull request #3912 from helderc/patch-1

Update HACKING.rst.txt
Merge pull request #3909 from WarrenWeckesser/count_nonzero

MAINT: Create a common version of `count_nonzero` for compatibility with numpy 1.5.
add dirichlet distribution to multivariate distributions