Merge nipy (0.4.0+git26-gf8d3149-2) import into refs/heads/workingbranch
authorYaroslav Halchenko <debian@onerussian.com>
Sun, 4 Sep 2016 14:18:55 +0000 (15:18 +0100)
committerYaroslav Halchenko <debian@onerussian.com>
Sun, 4 Sep 2016 14:18:55 +0000 (15:18 +0100)

Trivial merge