3.2 Final

Final commit of 3.2!