Merged 3.0.x into master, prepare for 3.0.8 release