Final commit for 0.7.1