Fork 1.1.5 (apparently 1.1.6 is not tagged)