Testing timing
Merge remote-tracking branch 'origin/approx_dist' into approx_dist

Conflicts:
	plot_pers_no_agg_bgp.py