Upstream Nengo changes.