Last update before 1.7.2 release (I hope)