Upstream PACMAN changes.
Upstream Nengo changes.
Merge in from master to track changes from Nengo and PACMAN upstreams.