Appended the b2de911...d667cd0 patch from master (komin) to external_kickoff