Final commit for 0.11.1