Final commit for 0.10.1