Upstream PACMAN changes.
Upstream Nengo changes.