Final commit before 1.7.2

*I wish the sonic was finished*