Track Nengo upstream.

(cherry picked from commit 2593f8a1df0621c2061da4d1c913b552a4a1ea72)