Merge nipy (0.4.0+git26-gf8d3149-2+rpi1) import into refs/heads/workingbranch
authorPeter Michael Green <plugwash@raspbian.org>
Sat, 4 Nov 2017 03:07:42 +0000 (03:07 +0000)
committerPeter Michael Green <plugwash@raspbian.org>
Sat, 4 Nov 2017 03:07:42 +0000 (03:07 +0000)

Trivial merge