DOC: document that first input to fftconvolve has to be larger than second input
MAINT: optimize: remove some unused variables from show_options() in optimize.py
BUG: fix invalid py3k syntax (u'') in savemat tests.

Introduced by https://github.com/scipy/scipy/pull/452

Ticket 1858 may be related, reports more failures caused by the same PR.
fixed bug in clpmn violating array bounds
test for bug in clpmn
FIX: replace spurious 1.0E+12 by finfo(float).max in slsqp

As discussed in PR#449 <https://github.com/scipy/scipy/pull/449>
add regression test for issue 1876
Merge pull request #482 from gertingold/clpmn

BUG: special: fixed bug in clpmn violating array bounds
change assert_ to assert_equal
Merge pull request #484 from jakevdp/csgraph1876_test

TST: sparse.csgraph: add regression test for issue 1876
DOC: stats: Fix spelling of 'parameter'.
Merge remote-tracking branch 'upstream/master' into fire